From 79bee61a14f4c74682e0e601d29731f7db0a9118 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 15 Aug 2011 12:23:11 -0700 Subject: [PATCH] * buffer.c (overlay_str_len): Now ptrdiff_t, not EMACS_INT, since either will do and ptrdiff_t is convenient with xpalloc. --- src/ChangeLog | 3 +++ src/buffer.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c2514360d91..fc12b899ad7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,9 @@ Integer and memory overflow issues (Bug#9196). + * buffer.c (overlay_str_len): Now ptrdiff_t, not EMACS_INT, + since either will do and ptrdiff_t is convenient with xpalloc. + * charset.c (charset_table_size) (struct charset_sort_data.priority): Now ptrdiff_t. (charset_compare): Don't overflow if priorities differ greatly. diff --git a/src/buffer.c b/src/buffer.c index b61d083c3e6..5a6484e3105 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2943,7 +2943,7 @@ static struct sortstrlist overlay_heads, overlay_tails; static unsigned char *overlay_str_buf; /* Allocated length of overlay_str_buf. */ -static EMACS_INT overlay_str_len; +static ptrdiff_t overlay_str_len; /* A comparison function suitable for passing to qsort. */ static int -- 2.30.2